From 740ba63f2b48b5773c9f7b362a52d5de06ca999a Mon Sep 17 00:00:00 2001 From: Keir Fraser Date: Wed, 11 Mar 2009 19:13:47 +0000 Subject: [PATCH] x86 hvm: Fix hvmemul_read_msr(). Original patch by Christoph Egger Signed-off-by: Keir Fraser --- xen/arch/x86/hvm/emulate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/hvm/emulate.c b/xen/arch/x86/hvm/emulate.c index 1e583bc2dc..6fbce84e90 100644 --- a/xen/arch/x86/hvm/emulate.c +++ b/xen/arch/x86/hvm/emulate.c @@ -793,7 +793,7 @@ static int hvmemul_read_msr( if ( (rc = hvm_msr_read_intercept(&_regs)) != 0 ) return rc; - *val = ((uint64_t)(uint32_t)_regs.edx << 32) || (uint32_t)_regs.eax; + *val = ((uint64_t)(uint32_t)_regs.edx << 32) | (uint32_t)_regs.eax; return X86EMUL_OKAY; } -- 2.30.2